Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 3 deletions

diff --git a/app/finders/clusters/agent_tokens_finder.rb b/app/finders/clusters/agent_tokens_finder.rb
index c0d1f911d92..72692777bc6 100644
--- a/app/finders/clusters/agent_tokens_finder.rb
+++ b/app/finders/clusters/agent_tokens_finder.rb
@@ -4,20 +4,25 @@ module Clusters
   class AgentTokensFinder
     include FinderMethods
 
-    def initialize(agent, current_user)
+    def initialize(agent, current_user, params = {})
       @agent = agent
       @current_user = current_user
+      @params = params
     end
 
     def execute
       return ::Clusters::AgentToken.none unless can_read_cluster_agents?
 
-      agent.agent_tokens
+      agent.agent_tokens.then { |agent_tokens| by_status(agent_tokens) }
     end
 
     private
 
-    attr_reader :agent, :current_user
+    attr_reader :agent, :current_user, :params
+
+    def by_status(agent_tokens)
+      params[:status].present? ? agent_tokens.with_status(params[:status]) : agent_tokens
+    end
 
     def can_read_cluster_agents?
       current_user&.can?(:read_cluster, agent&.project)