Merge branch 'mwaw/216963-annotations-missing-from-metric-charts' into 'master'

Fix: "Annotations missing from Metric Charts"

See merge request gitlab-org/gitlab!31474

app/graphql/types/metrics/dashboards/annotation_type.rb

@@ -16,10 +16,10 @@ module Types
         field :panel_id, GraphQL::STRING_TYPE, null: true,
               description: 'ID of a dashboard panel to which the annotation should be scoped'
 
-        field :starting_at, GraphQL::STRING_TYPE, null: true,
+        field :starting_at, Types::TimeType, null: true,
               description: 'Timestamp marking start of annotated time span'
 
-        field :ending_at, GraphQL::STRING_TYPE, null: true,
+        field :ending_at, Types::TimeType, null: true,
               description: 'Timestamp marking end of annotated time span'
 
         def panel_id

changelogs/unreleased/mwaw-216963-annotations-missing-from-metric-charts.yml

+---
+title: Use iso 8601 timestamp format in metrics dashboard annotations graphql resource
+  to assure multi browser compatibility
+merge_request: 31474
+author:
+type: fixed

doc/api/graphql/reference/gitlab_schema.graphql

@@ -6076,7 +6076,7 @@ type MetricsDashboardAnnotation {
   """
   Timestamp marking end of annotated time span
   """
-  endingAt: String
+  endingAt: Time
 
   """
   ID of the annotation
@@ -6091,7 +6091,7 @@ type MetricsDashboardAnnotation {
   """
   Timestamp marking start of annotated time span
   """
-  startingAt: String
+  startingAt: Time
 }
 
 """

doc/api/graphql/reference/gitlab_schema.json

@@ -17041,7 +17041,7 @@
               ],
               "type": {
                 "kind": "SCALAR",
-                "name": "String",
+                "name": "Time",
                 "ofType": null
               },
               "isDeprecated": false,
@@ -17087,7 +17087,7 @@
               ],
               "type": {
                 "kind": "SCALAR",
-                "name": "String",
+                "name": "Time",
                 "ofType": null
               },
               "isDeprecated": false,

doc/api/graphql/reference/index.md

@@ -916,10 +916,10 @@ Autogenerated return type of MergeRequestSetWip
 | Name  | Type  | Description |
 | ---   |  ---- | ----------  |
 | `description` | String | Description of the annotation |
-| `endingAt` | String | Timestamp marking end of annotated time span |
+| `endingAt` | Time | Timestamp marking end of annotated time span |
 | `id` | ID! | ID of the annotation |
 | `panelId` | String | ID of a dashboard panel to which the annotation should be scoped |
-| `startingAt` | String | Timestamp marking start of annotated time span |
+| `startingAt` | Time | Timestamp marking start of annotated time span |
 
 ## Milestone
 

spec/requests/api/graphql/metrics/dashboard/annotations_spec.rb

@@ -82,7 +82,7 @@ describe 'Getting Metrics Dashboard Annotations' do
                                               "description" => annotation.description,
                                               "id" => annotation.to_global_id.to_s,
                                               "panelId" => annotation.panel_xid,
-                                              "startingAt" => annotation.starting_at.to_s,
+                                              "startingAt" => annotation.starting_at.iso8601,
                                               "endingAt" => nil
                                             }]
       end