Merge branch 'issue_346033_1/2' into 'master'

Fix GraphQL/OrderedFields offenses

See merge request gitlab-org/gitlab!81425

.rubocop_todo/graphql/ordered_fields.yml

@@ -71,14 +71,6 @@ GraphQL/OrderedFields:
   - app/graphql/types/root_storage_statistics_type.rb
   - app/graphql/types/task_completion_status.rb
   - app/graphql/types/tree/blob_type.rb
-  - app/graphql/types/tree/submodule_type.rb
-  - app/graphql/types/tree/tree_entry_type.rb
-  - app/graphql/types/user_callout_type.rb
-  - app/graphql/types/user_status_type.rb
-  - ee/app/graphql/types/analytics/devops_adoption/snapshot_type.rb
-  - ee/app/graphql/types/epic_descendant_count_type.rb
-  - ee/app/graphql/types/epic_descendant_weight_sum_type.rb
-  - ee/app/graphql/types/epic_health_status_type.rb
   - ee/app/graphql/types/epic_type.rb
   - ee/app/graphql/types/geo/geo_node_type.rb
   - ee/app/graphql/types/requirements_management/requirement_states_count_type.rb

app/graphql/types/tree/submodule_type.rb

@@ -8,10 +8,10 @@ module Types
 
       implements Types::Tree::EntryType
 
-      field :web_url, type: GraphQL::Types::String, null: true,
-            description: 'Web URL for the sub-module.'
       field :tree_url, type: GraphQL::Types::String, null: true,
             description: 'Tree URL for the sub-module.'
+      field :web_url, type: GraphQL::Types::String, null: true,
+            description: 'Web URL for the sub-module.'
     end
     # rubocop: enable Graphql/AuthorizeTypes
   end

app/graphql/types/tree/tree_entry_type.rb

@@ -10,10 +10,10 @@ module Types
       implements Types::Tree::EntryType
       present_using TreeEntryPresenter
 
-      field :web_url, GraphQL::Types::String, null: true,
-            description: 'Web URL for the tree entry (directory).'
       field :web_path, GraphQL::Types::String, null: true,
             description: 'Web path for the tree entry (directory).'
+      field :web_url, GraphQL::Types::String, null: true,
+            description: 'Web URL for the tree entry (directory).'
     end
     # rubocop: enable Graphql/AuthorizeTypes
   end

app/graphql/types/user_callout_type.rb

@@ -4,9 +4,9 @@ module Types
   class UserCalloutType < BaseObject # rubocop:disable Graphql/AuthorizeTypes
     graphql_name 'UserCallout'
 
-    field :feature_name, UserCalloutFeatureNameEnum, null: true,
-      description: 'Name of the feature that the callout is for.'
     field :dismissed_at, Types::TimeType, null: true,
       description: 'Date when the callout was dismissed.'
+    field :feature_name, UserCalloutFeatureNameEnum, null: true,
+      description: 'Name of the feature that the callout is for.'
   end
 end

app/graphql/types/user_status_type.rb

@@ -7,11 +7,11 @@ module Types
 
     markdown_field :message_html, null: true,
       description: 'HTML of the user status message'
-    field :message, GraphQL::Types::String, null: true,
-      description: 'User status message.'
-    field :emoji, GraphQL::Types::String, null: true,
-      description: 'String representation of emoji.'
     field :availability, Types::AvailabilityEnum, null: false,
       description: 'User availability status.'
+    field :emoji, GraphQL::Types::String, null: true,
+      description: 'String representation of emoji.'
+    field :message, GraphQL::Types::String, null: true,
+      description: 'User status message.'
   end
 end

ee/app/graphql/types/analytics/devops_adoption/snapshot_type.rb

@@ -8,41 +8,41 @@ module Types
         graphql_name 'DevopsAdoptionSnapshot'
         description 'Snapshot'
 
+        field :code_owners_used_count, GraphQL::Types::Int, null: true,
+              description: 'Total number of projects with existing CODEOWNERS file.'
+        field :coverage_fuzzing_enabled_count, GraphQL::Types::Int, null: true,
+              description: 'Total number of projects with enabled coverage fuzzing.'
+        field :dast_enabled_count, GraphQL::Types::Int, null: true,
+              description: 'Total number of projects with enabled DAST.'
+        field :dependency_scanning_enabled_count, GraphQL::Types::Int, null: true,
+              description: 'Total number of projects with enabled dependency scanning.'
+        field :deploy_succeeded, GraphQL::Types::Boolean, null: false,
+              description: 'At least one deployment succeeded.'
+        field :end_time, Types::TimeType, null: false,
+              description: 'End time for the snapshot where the data points were collected.'
         field :issue_opened, GraphQL::Types::Boolean, null: false,
               description: 'At least one issue was opened.'
-        field :merge_request_opened, GraphQL::Types::Boolean, null: false,
-              description: 'At least one merge request was opened.'
         field :merge_request_approved, GraphQL::Types::Boolean, null: false,
               description: 'At least one merge request was approved.'
-        field :runner_configured, GraphQL::Types::Boolean, null: false,
-              description: 'At least one runner was used.'
+        field :merge_request_opened, GraphQL::Types::Boolean, null: false,
+              description: 'At least one merge request was opened.'
         field :pipeline_succeeded, GraphQL::Types::Boolean, null: false,
               description: 'At least one pipeline succeeded.'
-        field :deploy_succeeded, GraphQL::Types::Boolean, null: false,
-              description: 'At least one deployment succeeded.'
+        field :recorded_at, Types::TimeType, null: false,
+              description: 'Time the snapshot was recorded.'
+        field :runner_configured, GraphQL::Types::Boolean, null: false,
+              description: 'At least one runner was used.'
+        field :sast_enabled_count, GraphQL::Types::Int, null: true,
+              description: 'Total number of projects with enabled SAST.'
         field :security_scan_succeeded, GraphQL::Types::Boolean, null: false,
               description: 'At least one security scan succeeded.',
               deprecated: { reason: 'Substituted with specific security metrics. Always false', milestone: '14.1' }
-        field :code_owners_used_count, GraphQL::Types::Int, null: true,
-              description: 'Total number of projects with existing CODEOWNERS file.'
-        field :sast_enabled_count, GraphQL::Types::Int, null: true,
-              description: 'Total number of projects with enabled SAST.'
-        field :dast_enabled_count, GraphQL::Types::Int, null: true,
-              description: 'Total number of projects with enabled DAST.'
-        field :dependency_scanning_enabled_count, GraphQL::Types::Int, null: true,
-              description: 'Total number of projects with enabled dependency scanning.'
-        field :coverage_fuzzing_enabled_count, GraphQL::Types::Int, null: true,
-              description: 'Total number of projects with enabled coverage fuzzing.'
-        field :vulnerability_management_used_count, GraphQL::Types::Int, null: true,
-              description: 'Total number of projects with vulnerability management used at least once.'
-        field :total_projects_count, GraphQL::Types::Int, null: true,
-              description: 'Total number of projects.'
-        field :recorded_at, Types::TimeType, null: false,
-              description: 'Time the snapshot was recorded.'
         field :start_time, Types::TimeType, null: false,
               description: 'Start time for the snapshot where the data points were collected.'
-        field :end_time, Types::TimeType, null: false,
-              description: 'End time for the snapshot where the data points were collected.'
+        field :total_projects_count, GraphQL::Types::Int, null: true,
+              description: 'Total number of projects.'
+        field :vulnerability_management_used_count, GraphQL::Types::Int, null: true,
+              description: 'Total number of projects with vulnerability management used at least once.'
       end
     end
   end

ee/app/graphql/types/epic_descendant_count_type.rb

@@ -6,10 +6,10 @@ module Types
     graphql_name 'EpicDescendantCount'
     description 'Counts of descendent epics'
 
-    field :opened_epics, GraphQL::Types::Int, null: true, description: 'Number of opened child epics.'
     field :closed_epics, GraphQL::Types::Int, null: true, description: 'Number of closed child epics.'
-    field :opened_issues, GraphQL::Types::Int, null: true, description: 'Number of opened epic issues.'
     field :closed_issues, GraphQL::Types::Int, null: true, description: 'Number of closed epic issues.'
+    field :opened_epics, GraphQL::Types::Int, null: true, description: 'Number of opened child epics.'
+    field :opened_issues, GraphQL::Types::Int, null: true, description: 'Number of opened epic issues.'
   end
   # rubocop: enable Graphql/AuthorizeTypes
 end

ee/app/graphql/types/epic_descendant_weight_sum_type.rb

@@ -6,10 +6,10 @@ module Types
     graphql_name 'EpicDescendantWeights'
     description 'Total weight of open and closed descendant issues'
 
-    field :opened_issues, GraphQL::Types::Int, null: true,
-          description: 'Total weight of opened issues in this epic, including epic descendants.'
     field :closed_issues, GraphQL::Types::Int, null: true,
           description: 'Total weight of completed (closed) issues in this epic, including epic descendants.'
+    field :opened_issues, GraphQL::Types::Int, null: true,
+          description: 'Total weight of opened issues in this epic, including epic descendants.'
   end
   # rubocop: enable Graphql/AuthorizeTypes
 end

ee/app/graphql/types/epic_health_status_type.rb

@@ -6,9 +6,9 @@ module Types
     graphql_name 'EpicHealthStatus'
     description 'Health status of child issues'
 
-    field :issues_on_track, GraphQL::Types::Int, null: true, description: 'Number of issues on track.'
-    field :issues_needing_attention, GraphQL::Types::Int, null: true, description: 'Number of issues that need attention.'
     field :issues_at_risk, GraphQL::Types::Int, null: true, description: 'Number of issues at risk.'
+    field :issues_needing_attention, GraphQL::Types::Int, null: true, description: 'Number of issues that need attention.'
+    field :issues_on_track, GraphQL::Types::Int, null: true, description: 'Number of issues on track.'
   end
   # rubocop: enable Graphql/AuthorizeTypes
 end