diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-30 18:14:19 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-30 18:14:19 +0300 |
| commit | 048f666f8a2ba77e45146845ad280ea1c5460ccd (patch) | |
| tree | 38a2d1438d6c3bd060a72f889f9c1eaa4e7b79b3 /app/assets/javascripts/incidents | |
| parent | 19c9422e1f3792680aa3f9e6190218b31a838fe3 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/incidents')
3 files changed, 7 insertions, 0 deletions
diff --git a/app/assets/javascripts/incidents/graphql/fragments/incident_fields.fragment.graphql b/app/assets/javascripts/incidents/graphql/fragments/incident_fields.fragment.graphql index eb2dde14464..ac826fe26de 100644 --- a/app/assets/javascripts/incidents/graphql/fragments/incident_fields.fragment.graphql +++ b/app/assets/javascripts/incidents/graphql/fragments/incident_fields.fragment.graphql @@ -1,3 +1,5 @@ +# TODO: Uncomment next line when https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75220 is merged and the rule is enabled +# # eslint-disable-next-line @graphql-eslint/require-id-when-available fragment IncidentFields on Issue { severity } diff --git a/app/assets/javascripts/incidents/graphql/queries/get_count_by_status.query.graphql b/app/assets/javascripts/incidents/graphql/queries/get_count_by_status.query.graphql index 4e44a506c4f..fda8a65d4a4 100644 --- a/app/assets/javascripts/incidents/graphql/queries/get_count_by_status.query.graphql +++ b/app/assets/javascripts/incidents/graphql/queries/get_count_by_status.query.graphql @@ -6,6 +6,7 @@ query getIncidentsCountByStatus( $assigneeUsername: String = "" ) { project(fullPath: $projectPath) { + id issueStatusCounts( search: $searchTerm types: $issueTypes diff --git a/app/assets/javascripts/incidents/graphql/queries/get_incidents.query.graphql b/app/assets/javascripts/incidents/graphql/queries/get_incidents.query.graphql index f97664a3b77..1e18d89b656 100644 --- a/app/assets/javascripts/incidents/graphql/queries/get_incidents.query.graphql +++ b/app/assets/javascripts/incidents/graphql/queries/get_incidents.query.graphql @@ -14,6 +14,7 @@ query getIncidents( $assigneeUsername: String = "" ) { project(fullPath: $projectPath) { + id issues( search: $searchTerm types: $issueTypes @@ -27,18 +28,21 @@ query getIncidents( before: $prevPageCursor ) { nodes { + id iid title createdAt state labels { nodes { + id title color } } assignees { nodes { + id name username avatarUrl |