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-17 00:09:48 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-06-17 00:09:48 +0300
commit9b8433e5ecd54f93ee8df3bb9d9038e978d57afc (patch)
treeb94758d475fe9ffe547eb838fbf15b3910234426 /app/assets/javascripts/editor
parentdbfedde341ef6434d40c4c2495f2be751f8bb973 (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, 4 insertions, 14 deletions
diff --git a/app/assets/javascripts/editor/graphql/add_items.mutation.graphql b/app/assets/javascripts/editor/graphql/add_items.mutation.graphql
index 340a1ec09dc..13afcc04a48 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: [ItemInput]) {
+mutation addItems($items: [Item]) {
addToolbarItems(items: $items) @client
}
diff --git a/app/assets/javascripts/editor/graphql/typedefs.graphql b/app/assets/javascripts/editor/graphql/typedefs.graphql
index 2733db26282..2433ebf6c66 100644
--- a/app/assets/javascripts/editor/graphql/typedefs.graphql
+++ b/app/assets/javascripts/editor/graphql/typedefs.graphql
@@ -8,16 +8,6 @@ type Item {
selectedLabel: String
}
-input ItemInput {
- id: ID!
- label: String!
- icon: String
- selected: Boolean
- group: Int!
- category: String
- selectedLabel: String
-}
-
type Items {
nodes: [Item]!
}
@@ -27,7 +17,7 @@ extend type Query {
}
extend type Mutation {
- updateToolbarItem(id: ID!, propsToUpdate: ItemInput!): LocalErrors
+ updateToolbarItem(id: ID!, propsToUpdate: Item!): LocalErrors
removeToolbarItems(ids: [ID!]): LocalErrors
- addToolbarItems(items: [ItemInput]): LocalErrors
+ addToolbarItems(items: [Item]): LocalErrors
}
diff --git a/app/assets/javascripts/editor/graphql/update_item.mutation.graphql b/app/assets/javascripts/editor/graphql/update_item.mutation.graphql
index f9158570abb..05c18988c87 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: ItemInput!) {
+mutation updateItem($id: ID!, $propsToUpdate: Item!) {
updateToolbarItem(id: $id, propsToUpdate: $propsToUpdate) @client
}