Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-06-16 12:09:15 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-06-16 12:09:15 +0300
commitb7b44de429911864686599ef1643baf525bf75ec (patch)
tree5c066cff07a9900bbc4c1907b0563857b4361b40 /app/assets/javascripts/editor
parent06bcbc77e472a70b8332150a941539c55953ef2b (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/editor')
-rw-r--r--app/assets/javascripts/editor/graphql/add_items.mutation.graphql2
-rw-r--r--app/assets/javascripts/editor/graphql/typedefs.graphql14
-rw-r--r--app/assets/javascripts/editor/graphql/update_item.mutation.graphql2
3 files changed, 14 insertions, 4 deletions
diff --git a/app/assets/javascripts/editor/graphql/add_items.mutation.graphql b/app/assets/javascripts/editor/graphql/add_items.mutation.graphql
index 13afcc04a48..340a1ec09dc 100644
--- a/app/assets/javascripts/editor/graphql/add_items.mutation.graphql
+++ b/app/assets/javascripts/editor/graphql/add_items.mutation.graphql
@@ -1,3 +1,3 @@
-mutation addItems($items: [Item]) {
+mutation addItems($items: [ItemInput]) {
addToolbarItems(items: $items) @client
}
diff --git a/app/assets/javascripts/editor/graphql/typedefs.graphql b/app/assets/javascripts/editor/graphql/typedefs.graphql
index 2433ebf6c66..2733db26282 100644
--- a/app/assets/javascripts/editor/graphql/typedefs.graphql
+++ b/app/assets/javascripts/editor/graphql/typedefs.graphql
@@ -8,6 +8,16 @@ type Item {
selectedLabel: String
}
+input ItemInput {
+ id: ID!
+ label: String!
+ icon: String
+ selected: Boolean
+ group: Int!
+ category: String
+ selectedLabel: String
+}
+
type Items {
nodes: [Item]!
}
@@ -17,7 +27,7 @@ extend type Query {
}
extend type Mutation {
- updateToolbarItem(id: ID!, propsToUpdate: Item!): LocalErrors
+ updateToolbarItem(id: ID!, propsToUpdate: ItemInput!): LocalErrors
removeToolbarItems(ids: [ID!]): LocalErrors
- addToolbarItems(items: [Item]): LocalErrors
+ addToolbarItems(items: [ItemInput]): LocalErrors
}
diff --git a/app/assets/javascripts/editor/graphql/update_item.mutation.graphql b/app/assets/javascripts/editor/graphql/update_item.mutation.graphql
index 05c18988c87..f9158570abb 100644
--- a/app/assets/javascripts/editor/graphql/update_item.mutation.graphql
+++ b/app/assets/javascripts/editor/graphql/update_item.mutation.graphql
@@ -1,3 +1,3 @@
-mutation updateItem($id: ID!, $propsToUpdate: Item!) {
+mutation updateItem($id: ID!, $propsToUpdate: ItemInput!) {
updateToolbarItem(id: $id, propsToUpdate: $propsToUpdate) @client
}