Merge branch 'issue_346033_1/6' into 'master'

Fix GraphQL/OrderedFields offenses

See merge request gitlab-org/gitlab!81469

app/graphql/types/metadata/kas_type.rb

@@ -9,10 +9,10 @@ module Types
 
       field :enabled, GraphQL::Types::Boolean, null: false,
             description: 'Indicates whether the Kubernetes Agent Server is enabled.'
-      field :version, GraphQL::Types::String, null: true,
-            description: 'KAS version.'
       field :external_url, GraphQL::Types::String, null: true,
             description: 'URL used by the Agents to communicate with KAS.'
+      field :version, GraphQL::Types::String, null: true,
+            description: 'KAS version.'
     end
   end
 end

app/graphql/types/metadata_type.rb

@@ -6,11 +6,11 @@ module Types
 
     authorize :read_instance_metadata
 
-    field :version, GraphQL::Types::String, null: false,
-          description: 'Version.'
-    field :revision, GraphQL::Types::String, null: false,
-          description: 'Revision.'
     field :kas, ::Types::Metadata::KasType, null: false,
           description: 'Metadata about KAS.'
+    field :revision, GraphQL::Types::String, null: false,
+          description: 'Revision.'
+    field :version, GraphQL::Types::String, null: false,
+          description: 'Version.'
   end
 end

app/graphql/types/namespace/package_settings_type.rb

@@ -8,9 +8,9 @@ module Types
 
     authorize :read_package_settings
 
-    field :maven_duplicates_allowed, GraphQL::Types::Boolean, null: false, description: 'Indicates whether duplicate Maven packages are allowed for this namespace.'
-    field :maven_duplicate_exception_regex, Types::UntrustedRegexp, null: true, description: 'When maven_duplicates_allowed is false, you can publish duplicate packages with names that match this regex. Otherwise, this setting has no effect.'
-    field :generic_duplicates_allowed, GraphQL::Types::Boolean, null: false, description: 'Indicates whether duplicate generic packages are allowed for this namespace.'
     field :generic_duplicate_exception_regex, Types::UntrustedRegexp, null: true, description: 'When generic_duplicates_allowed is false, you can publish duplicate packages with names that match this regex. Otherwise, this setting has no effect.'
+    field :generic_duplicates_allowed, GraphQL::Types::Boolean, null: false, description: 'Indicates whether duplicate generic packages are allowed for this namespace.'
+    field :maven_duplicate_exception_regex, Types::UntrustedRegexp, null: true, description: 'When maven_duplicates_allowed is false, you can publish duplicate packages with names that match this regex. Otherwise, this setting has no effect.'
+    field :maven_duplicates_allowed, GraphQL::Types::Boolean, null: false, description: 'Indicates whether duplicate Maven packages are allowed for this namespace.'
   end
 end

app/graphql/types/namespace_type.rb

@@ -9,14 +9,14 @@ module Types
     field :id, GraphQL::Types::ID, null: false,
           description: 'ID of the namespace.'
 
-    field :name, GraphQL::Types::String, null: false,
-          description: 'Name of the namespace.'
-    field :path, GraphQL::Types::String, null: false,
-          description: 'Path of the namespace.'
     field :full_name, GraphQL::Types::String, null: false,
           description: 'Full name of the namespace.'
     field :full_path, GraphQL::Types::ID, null: false,
           description: 'Full path of the namespace.'
+    field :name, GraphQL::Types::String, null: false,
+          description: 'Name of the namespace.'
+    field :path, GraphQL::Types::String, null: false,
+          description: 'Path of the namespace.'
 
     field :cross_project_pipeline_available, GraphQL::Types::Boolean, null: false,
           resolver_method: :cross_project_pipeline_available?,
@@ -25,12 +25,12 @@ module Types
     field :description, GraphQL::Types::String, null: true,
           description: 'Description of the namespace.'
 
-    field :visibility, GraphQL::Types::String, null: true,
-          description: 'Visibility of the namespace.'
     field :lfs_enabled, GraphQL::Types::Boolean, null: true, method: :lfs_enabled?,
           description: 'Indicates if Large File Storage (LFS) is enabled for namespace.'
     field :request_access_enabled, GraphQL::Types::Boolean, null: true,
           description: 'Indicates if users can request access to namespace.'
+    field :visibility, GraphQL::Types::String, null: true,
+          description: 'Visibility of the namespace.'
 
     field :root_storage_statistics, Types::RootStorageStatisticsType,
           null: true,

app/graphql/types/notes/diff_position_type.rb

@@ -12,28 +12,28 @@ module Types
 
       field :file_path, GraphQL::Types::String, null: false,
             description: 'Path of the file that was changed.'
-      field :old_path, GraphQL::Types::String, null: true,
-            description: 'Path of the file on the start SHA.'
       field :new_path, GraphQL::Types::String, null: true,
             description: 'Path of the file on the HEAD SHA.'
+      field :old_path, GraphQL::Types::String, null: true,
+            description: 'Path of the file on the start SHA.'
       field :position_type, Types::Notes::PositionTypeEnum, null: false,
             description: 'Type of file the position refers to.'
 
       # Fields for text positions
-      field :old_line, GraphQL::Types::Int, null: true,
-            description: 'Line on start SHA that was changed.'
       field :new_line, GraphQL::Types::Int, null: true,
             description: 'Line on HEAD SHA that was changed.'
+      field :old_line, GraphQL::Types::Int, null: true,
+            description: 'Line on start SHA that was changed.'
 
       # Fields for image positions
+      field :height, GraphQL::Types::Int, null: true,
+            description: 'Total height of the image.'
+      field :width, GraphQL::Types::Int, null: true,
+            description: 'Total width of the image.'
       field :x, GraphQL::Types::Int, null: true,
             description: 'X position of the note.'
       field :y, GraphQL::Types::Int, null: true,
             description: 'Y position of the note.'
-      field :width, GraphQL::Types::Int, null: true,
-            description: 'Total width of the image.'
-      field :height, GraphQL::Types::Int, null: true,
-            description: 'Total height of the image.'
 
       def old_line
         object.old_line if object.on_text?

app/graphql/types/notes/discussion_type.rb

@@ -11,16 +11,16 @@ module Types
 
       implements(Types::ResolvableInterface)
 
-      field :id, DiscussionID, null: false,
-            description: "ID of this discussion."
-      field :reply_id, DiscussionID, null: false,
-            description: 'ID used to reply to this discussion.'
       field :created_at, Types::TimeType, null: false,
             description: "Timestamp of the discussion's creation."
-      field :notes, Types::Notes::NoteType.connection_type, null: false,
-            description: 'All notes in the discussion.'
+      field :id, DiscussionID, null: false,
+            description: "ID of this discussion."
       field :noteable, Types::NoteableType, null: true,
             description: 'Object which the discussion belongs to.'
+      field :notes, Types::Notes::NoteType.connection_type, null: false,
+            description: 'All notes in the discussion.'
+      field :reply_id, DiscussionID, null: false,
+            description: 'ID used to reply to this discussion.'
 
       # DiscussionID.coerce_result is suitable here, but will always mark this
       # as being a 'Discussion'. Using `GlobalId.build` guarantees that we get

app/graphql/types/notes/note_type.rb

@@ -33,17 +33,17 @@ module Types
             method: :note,
             description: 'Content of the note.'
 
+      field :confidential, GraphQL::Types::Boolean, null: true,
+            description: 'Indicates if this note is confidential.',
+            method: :confidential?
       field :created_at, Types::TimeType, null: false,
             description: 'Timestamp of the note creation.'
-      field :updated_at, Types::TimeType, null: false,
-            description: "Timestamp of the note's last activity."
       field :discussion, Types::Notes::DiscussionType, null: true,
             description: 'Discussion this note is a part of.'
       field :position, Types::Notes::DiffPositionType, null: true,
             description: 'Position of this note on a diff.'
-      field :confidential, GraphQL::Types::Boolean, null: true,
-            description: 'Indicates if this note is confidential.',
-            method: :confidential?
+      field :updated_at, Types::TimeType, null: false,
+            description: "Timestamp of the note's last activity."
       field :url, GraphQL::Types::String,
             null: true,
             description: 'URL to view this Note in the Web UI.'