Add latest changes from gitlab-org/gitlab@13-1-stable-ee

2 files changed, 46 insertions, 0 deletions

diff --git a/app/graphql/resolvers/alert_management/alert_resolver.rb b/app/graphql/resolvers/alert_management/alert_resolver.rb
new file mode 100644
index 00000000000..71a7615685a
--- /dev/null
+++ b/app/graphql/resolvers/alert_management/alert_resolver.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Resolvers
+  module AlertManagement
+    class AlertResolver < BaseResolver
+      include LooksAhead
+
+      argument :iid, GraphQL::STRING_TYPE,
+                required: false,
+                description: 'IID of the alert. For example, "1"'
+
+      argument :statuses, [Types::AlertManagement::StatusEnum],
+                as: :status,
+                required: false,
+                description: 'Alerts with the specified statues. For example, [TRIGGERED]'
+
+      argument :sort, Types::AlertManagement::AlertSortEnum,
+                description: 'Sort alerts by this criteria',
+                required: false
+
+      argument :search, GraphQL::STRING_TYPE,
+                description: 'Search criteria for filtering alerts. This will search on title, description, service, monitoring_tool.',
+                required: false
+
+      type Types::AlertManagement::AlertType, null: true
+
+      def resolve_with_lookahead(**args)
+        parent = object.respond_to?(:sync) ? object.sync : object
+        return ::AlertManagement::Alert.none if parent.nil?
+
+        apply_lookahead(::AlertManagement::AlertsFinder.new(context[:current_user], parent, args).execute)
+      end
+
+      def preloads
+        {
+          assignees: [:assignees],
+          notes: [:ordered_notes, { ordered_notes: [:system_note_metadata, :project, :noteable] }]
+        }
+      end
+    end
+  end
+end
diff --git a/app/graphql/resolvers/alert_management/alert_status_counts_resolver.rb b/app/graphql/resolvers/alert_management/alert_status_counts_resolver.rb
index 7f4346632ca..a45de21002f 100644
--- a/app/graphql/resolvers/alert_management/alert_status_counts_resolver.rb
+++ b/app/graphql/resolvers/alert_management/alert_status_counts_resolver.rb
@@ -5,6 +5,10 @@ module Resolvers
     class AlertStatusCountsResolver < BaseResolver
       type Types::AlertManagement::AlertStatusCountsType, null: true
 
+      argument :search, GraphQL::STRING_TYPE,
+                description: 'Search criteria for filtering alerts. This will search on title, description, service, monitoring_tool.',
+                required: false
+
       def resolve(**args)
         ::Gitlab::AlertManagement::AlertStatusCounts.new(context[:current_user], object, args)
       end