diff options
Diffstat (limited to 'app/assets/javascripts/work_items/graphql')
-rw-r--r-- | app/assets/javascripts/work_items/graphql/create_work_item_note.mutation.graphql | 5 | ||||
-rw-r--r-- | app/assets/javascripts/work_items/graphql/project_work_items.query.graphql | 1 | ||||
-rw-r--r-- | app/assets/javascripts/work_items/graphql/work_item.fragment.graphql | 1 | ||||
-rw-r--r-- | app/assets/javascripts/work_items/graphql/work_item_links.query.graphql | 1 | ||||
-rw-r--r-- | app/assets/javascripts/work_items/graphql/work_item_metadata_widgets.fragment.graphql | 1 | ||||
-rw-r--r-- | app/assets/javascripts/work_items/graphql/work_item_note.fragment.graphql (renamed from app/assets/javascripts/work_items/graphql/discussion.fragment.graphql) | 8 | ||||
-rw-r--r-- | app/assets/javascripts/work_items/graphql/work_item_notes.query.graphql | 6 | ||||
-rw-r--r-- | app/assets/javascripts/work_items/graphql/work_item_notes_by_iid.query.graphql | 6 | ||||
-rw-r--r-- | app/assets/javascripts/work_items/graphql/work_item_tree.query.graphql | 2 | ||||
-rw-r--r-- | app/assets/javascripts/work_items/graphql/work_item_widgets.fragment.graphql | 2 |
10 files changed, 22 insertions, 11 deletions
diff --git a/app/assets/javascripts/work_items/graphql/create_work_item_note.mutation.graphql b/app/assets/javascripts/work_items/graphql/create_work_item_note.mutation.graphql new file mode 100644 index 00000000000..6a7afd7bd5b --- /dev/null +++ b/app/assets/javascripts/work_items/graphql/create_work_item_note.mutation.graphql @@ -0,0 +1,5 @@ +mutation createWorkItemNote($input: CreateNoteInput!) { + createNote(input: $input) { + errors + } +} diff --git a/app/assets/javascripts/work_items/graphql/project_work_items.query.graphql b/app/assets/javascripts/work_items/graphql/project_work_items.query.graphql index 3a23db3886a..fce10f6f2a6 100644 --- a/app/assets/javascripts/work_items/graphql/project_work_items.query.graphql +++ b/app/assets/javascripts/work_items/graphql/project_work_items.query.graphql @@ -11,6 +11,7 @@ query projectWorkItems( id title state + confidential } } } diff --git a/app/assets/javascripts/work_items/graphql/work_item.fragment.graphql b/app/assets/javascripts/work_items/graphql/work_item.fragment.graphql index 6a81cc230b1..3ee263c149d 100644 --- a/app/assets/javascripts/work_items/graphql/work_item.fragment.graphql +++ b/app/assets/javascripts/work_items/graphql/work_item.fragment.graphql @@ -12,6 +12,7 @@ fragment WorkItem on WorkItem { project { id fullPath + archived } workItemType { id diff --git a/app/assets/javascripts/work_items/graphql/work_item_links.query.graphql b/app/assets/javascripts/work_items/graphql/work_item_links.query.graphql index 7fcf622cdb2..7d7bb9c7fc5 100644 --- a/app/assets/javascripts/work_items/graphql/work_item_links.query.graphql +++ b/app/assets/javascripts/work_items/graphql/work_item_links.query.graphql @@ -3,6 +3,7 @@ query workItemLinksQuery($id: WorkItemID!) { id workItemType { id + name } title userPermissions { diff --git a/app/assets/javascripts/work_items/graphql/work_item_metadata_widgets.fragment.graphql b/app/assets/javascripts/work_items/graphql/work_item_metadata_widgets.fragment.graphql index baefcdaea93..b7813ca4dc6 100644 --- a/app/assets/javascripts/work_items/graphql/work_item_metadata_widgets.fragment.graphql +++ b/app/assets/javascripts/work_items/graphql/work_item_metadata_widgets.fragment.graphql @@ -19,7 +19,6 @@ fragment WorkItemMetadataWidgets on WorkItemWidget { } ... on WorkItemWidgetLabels { type - allowsScopedLabels labels { nodes { ...Label diff --git a/app/assets/javascripts/work_items/graphql/discussion.fragment.graphql b/app/assets/javascripts/work_items/graphql/work_item_note.fragment.graphql index 62ced6bdfea..5215ea10918 100644 --- a/app/assets/javascripts/work_items/graphql/discussion.fragment.graphql +++ b/app/assets/javascripts/work_items/graphql/work_item_note.fragment.graphql @@ -1,12 +1,16 @@ #import "~/graphql_shared/fragments/user.fragment.graphql" -fragment Discussion on Note { +fragment WorkItemNote on Note { id - body bodyHtml + system + internal systemNoteIconName createdAt author { ...User } + userPermissions { + adminNote + } } diff --git a/app/assets/javascripts/work_items/graphql/work_item_notes.query.graphql b/app/assets/javascripts/work_items/graphql/work_item_notes.query.graphql index 9439f22f955..9ea9cecc81a 100644 --- a/app/assets/javascripts/work_items/graphql/work_item_notes.query.graphql +++ b/app/assets/javascripts/work_items/graphql/work_item_notes.query.graphql @@ -1,5 +1,5 @@ #import "~/graphql_shared/fragments/page_info.fragment.graphql" -#import "~/work_items/graphql/discussion.fragment.graphql" +#import "~/work_items/graphql/work_item_note.fragment.graphql" query workItemNotes($id: WorkItemID!, $after: String, $pageSize: Int) { workItem(id: $id) { @@ -8,7 +8,7 @@ query workItemNotes($id: WorkItemID!, $after: String, $pageSize: Int) { widgets { ... on WorkItemWidgetNotes { type - discussions(first: $pageSize, after: $after, filter: ONLY_ACTIVITY) { + discussions(first: $pageSize, after: $after, filter: ALL_NOTES) { pageInfo { ...PageInfo } @@ -16,7 +16,7 @@ query workItemNotes($id: WorkItemID!, $after: String, $pageSize: Int) { id notes { nodes { - ...Discussion + ...WorkItemNote } } } diff --git a/app/assets/javascripts/work_items/graphql/work_item_notes_by_iid.query.graphql b/app/assets/javascripts/work_items/graphql/work_item_notes_by_iid.query.graphql index 3e0960f3f54..f401aa5595e 100644 --- a/app/assets/javascripts/work_items/graphql/work_item_notes_by_iid.query.graphql +++ b/app/assets/javascripts/work_items/graphql/work_item_notes_by_iid.query.graphql @@ -1,5 +1,5 @@ #import "~/graphql_shared/fragments/page_info.fragment.graphql" -#import "~/work_items/graphql/discussion.fragment.graphql" +#import "~/work_items/graphql/work_item_note.fragment.graphql" query workItemNotesByIid($fullPath: ID!, $iid: String, $after: String, $pageSize: Int) { workspace: project(fullPath: $fullPath) { @@ -11,7 +11,7 @@ query workItemNotesByIid($fullPath: ID!, $iid: String, $after: String, $pageSize widgets { ... on WorkItemWidgetNotes { type - discussions(first: $pageSize, after: $after, filter: ONLY_ACTIVITY) { + discussions(first: $pageSize, after: $after, filter: ALL_NOTES) { pageInfo { ...PageInfo } @@ -19,7 +19,7 @@ query workItemNotesByIid($fullPath: ID!, $iid: String, $after: String, $pageSize id notes { nodes { - ...Discussion + ...WorkItemNote } } } diff --git a/app/assets/javascripts/work_items/graphql/work_item_tree.query.graphql b/app/assets/javascripts/work_items/graphql/work_item_tree.query.graphql index 006ca29e01c..b4fb83b24c2 100644 --- a/app/assets/javascripts/work_items/graphql/work_item_tree.query.graphql +++ b/app/assets/javascripts/work_items/graphql/work_item_tree.query.graphql @@ -1,6 +1,6 @@ #import "~/graphql_shared/fragments/label.fragment.graphql" #import "~/graphql_shared/fragments/user.fragment.graphql" -#import "./work_item_metadata_widgets.fragment.graphql" +#import "ee_else_ce/work_items/graphql/work_item_metadata_widgets.fragment.graphql" query workItemTreeQuery($id: WorkItemID!) { workItem(id: $id) { diff --git a/app/assets/javascripts/work_items/graphql/work_item_widgets.fragment.graphql b/app/assets/javascripts/work_items/graphql/work_item_widgets.fragment.graphql index cf3374e1737..d2a2d7927d3 100644 --- a/app/assets/javascripts/work_items/graphql/work_item_widgets.fragment.graphql +++ b/app/assets/javascripts/work_items/graphql/work_item_widgets.fragment.graphql @@ -1,7 +1,7 @@ #import "~/graphql_shared/fragments/label.fragment.graphql" #import "~/graphql_shared/fragments/user.fragment.graphql" #import "~/work_items/graphql/milestone.fragment.graphql" -#import "./work_item_metadata_widgets.fragment.graphql" +#import "ee_else_ce/work_items/graphql/work_item_metadata_widgets.fragment.graphql" fragment WorkItemWidgets on WorkItemWidget { ... on WorkItemWidgetDescription { |