Merge branch 'pl-alert-management-graphql-sort' into 'master'

Fix sorting alerts in GraphQL

See merge request gitlab-org/gitlab!31360

app/graphql/types/alert_management/alert_sort_enum.rb

@@ -11,9 +11,9 @@ module Types
       value 'END_TIME_ASC', 'End time by ascending order', value: :end_time_asc
       value 'END_TIME_DESC', 'End time by descending order', value: :end_time_desc
       value 'CREATED_TIME_ASC', 'Created time by ascending order', value: :created_at_asc
-      value 'CREATED_TIME_DESC', 'Created time by ascending order', value: :created_at_desc
-      value 'UPDATED_TIME_ASC', 'Created time by ascending order', value: :updated_at_desc
-      value 'UPDATED_TIME_DESC', 'Created time by ascending order', value: :updated_at_desc
+      value 'CREATED_TIME_DESC', 'Created time by descending order', value: :created_at_desc
+      value 'UPDATED_TIME_ASC', 'Created time by ascending order', value: :updated_at_asc
+      value 'UPDATED_TIME_DESC', 'Created time by descending order', value: :updated_at_desc
       value 'EVENTS_COUNT_ASC', 'Events count by ascending order', value: :events_count_asc
       value 'EVENTS_COUNT_DESC', 'Events count by descending order', value: :events_count_desc
       value 'SEVERITY_ASC', 'Severity by ascending order', value: :severity_asc

doc/api/graphql/reference/gitlab_schema.graphql

@@ -258,7 +258,7 @@ enum AlertManagementAlertSort {
   CREATED_TIME_ASC
 
   """
-  Created time by ascending order
+  Created time by descending order
   """
   CREATED_TIME_DESC
 
@@ -318,7 +318,7 @@ enum AlertManagementAlertSort {
   UPDATED_TIME_ASC
 
   """
-  Created time by ascending order
+  Created time by descending order
   """
   UPDATED_TIME_DESC
 

doc/api/graphql/reference/gitlab_schema.json

@@ -786,7 +786,7 @@
             },
             {
               "name": "CREATED_TIME_DESC",
-              "description": "Created time by ascending order",
+              "description": "Created time by descending order",
               "isDeprecated": false,
               "deprecationReason": null
             },
@@ -798,7 +798,7 @@
             },
             {
               "name": "UPDATED_TIME_DESC",
-              "description": "Created time by ascending order",
+              "description": "Created time by descending order",
               "isDeprecated": false,
               "deprecationReason": null
             },