add type filter to admin runners page

app/assets/javascripts/filtered_search/admin_runners_filtered_search_token_keys.js

@@ -7,6 +7,13 @@ const tokenKeys = [{
   symbol: '',
   icon: 'signal',
   tag: 'status',
+}, {
+  key: 'type',
+  type: 'string',
+  param: 'type',
+  symbol: '',
+  icon: 'cube',
+  tag: 'type',
 }];
 
 const AdminRunnersFilteredSearchTokenKeys = new FilteredSearchTokenKeys(tokenKeys);

app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js

@@ -96,6 +96,11 @@ export default class FilteredSearchDropdownManager {
         gl: NullDropdown,
         element: this.container.querySelector('#js-dropdown-admin-runner-status'),
       },
+      type: {
+        reference: null,
+        gl: NullDropdown,
+        element: this.container.querySelector('#js-dropdown-admin-runner-type'),
+      },
     };
 
     supportedTokens.forEach((type) => {

app/finders/admin/runners_finder.rb

@@ -10,6 +10,7 @@ class Admin::RunnersFinder < UnionFinder
   def execute
     search!
     filter_by_status!
+    filter_by_runner_type!
     sort!
     paginate!
 
@@ -36,10 +37,11 @@ class Admin::RunnersFinder < UnionFinder
   end
 
   def filter_by_status!
-    status = @params[:status_status]
-    if status.present? && Ci::Runner::AVAILABLE_STATUSES.include?(status)
-      @runners = @runners.public_send(status) # rubocop:disable GitlabSecurity/PublicSend
-    end
+    filter_by!(:status_status, Ci::Runner::AVAILABLE_STATUSES)
+  end
+
+  def filter_by_runner_type!
+    filter_by!(:type_type, Ci::Runner::AVAILABLE_TYPES)
   end
 
   def sort!
@@ -49,4 +51,12 @@ class Admin::RunnersFinder < UnionFinder
   def paginate!
     @runners = @runners.page(@params[:page]).per(NUMBER_OF_RUNNERS_PER_PAGE)
   end
+
+  def filter_by!(scope_name, available_scopes)
+    scope = @params[scope_name]
+
+    if scope.present? && available_scopes.include?(scope)
+      @runners = @runners.public_send(scope) # rubocop:disable GitlabSecurity/PublicSend
+    end
+  end
 end

app/views/admin/runners/index.html.haml

@@ -82,12 +82,21 @@
                       {{hint}}
                     %span.js-filter-tag.dropdown-light-content
                       {{tag}}
+
             #js-dropdown-admin-runner-status.filtered-search-input-dropdown-menu.dropdown-menu
               %ul{ data: { dropdown: true } }
                 - Ci::Runner::AVAILABLE_STATUSES.each do |status|
                   %li.filter-dropdown-item{ data: { value: status } }
                     = button_tag class: %w[btn btn-link] do
                       = status.titleize
+
+            #js-dropdown-admin-runner-type.filtered-search-input-dropdown-menu.dropdown-menu
+              %ul{ data: { dropdown: true } }
+                - Ci::Runner::AVAILABLE_TYPES.each do |runner_type|
+                  %li.filter-dropdown-item{ data: { value: runner_type } }
+                    = button_tag class: %w[btn btn-link] do
+                      = runner_type.titleize
+
           = button_tag class: %w[clear-search hidden] do
             = icon('times')
         .filter-dropdown-container

spec/features/admin/admin_runners_spec.rb

@@ -73,24 +73,72 @@ describe "Admin Runners" do
 
           expect(page).to have_text 'No runners found'
         end
+
+        it 'shows correct runner when status is selected and search term is entered' do
+          create(:ci_runner, description: 'runner-a-1', active: true)
+          create(:ci_runner, description: 'runner-a-2', active: false)
+          create(:ci_runner, description: 'runner-b-1', active: true)
+
+          visit admin_runners_path
+
+          input_filtered_search_keys('status:active')
+          expect(page).to have_content 'runner-a-1'
+          expect(page).to have_content 'runner-b-1'
+          expect(page).not_to have_content 'runner-a-2'
+
+          input_filtered_search_keys('status:active runner-a')
+          expect(page).to have_content 'runner-a-1'
+          expect(page).not_to have_content 'runner-b-1'
+          expect(page).not_to have_content 'runner-a-2'
+        end
       end
 
-      it 'shows correct runner when status is selected and search term is entered', :js do
-        create(:ci_runner, description: 'runner-a-1', active: true)
-        create(:ci_runner, description: 'runner-a-2', active: false)
-        create(:ci_runner, description: 'runner-b-1', active: true)
+      describe 'filter by type', :js do
+        it 'shows correct runner when type matches' do
+          create :ci_runner, :project, description: 'runner-project'
+          create :ci_runner, :group, description: 'runner-group'
 
-        visit admin_runners_path
+          visit admin_runners_path
+
+          expect(page).to have_content 'runner-project'
+          expect(page).to have_content 'runner-group'
 
-        input_filtered_search_keys('status:active')
-        expect(page).to have_content 'runner-a-1'
-        expect(page).to have_content 'runner-b-1'
-        expect(page).not_to have_content 'runner-a-2'
+          input_filtered_search_keys('type:project_type')
+          expect(page).to have_content 'runner-project'
+          expect(page).not_to have_content 'runner-group'
+        end
+
+        it 'shows no runner when type does not match' do
+          create :ci_runner, :project, description: 'runner-project'
+          create :ci_runner, :group, description: 'runner-group'
 
-        input_filtered_search_keys('status:active runner-a')
-        expect(page).to have_content 'runner-a-1'
-        expect(page).not_to have_content 'runner-b-1'
-        expect(page).not_to have_content 'runner-a-2'
+          visit admin_runners_path
+
+          input_filtered_search_keys('type:instance_type')
+
+          expect(page).not_to have_content 'runner-project'
+          expect(page).not_to have_content 'runner-group'
+
+          expect(page).to have_text 'No runners found'
+        end
+
+        it 'shows correct runner when type is selected and search term is entered' do
+          create :ci_runner, :project, description: 'runner-a-1'
+          create :ci_runner, :instance, description: 'runner-a-2'
+          create :ci_runner, :project, description: 'runner-b-1'
+
+          visit admin_runners_path
+
+          input_filtered_search_keys('type:project_type')
+          expect(page).to have_content 'runner-a-1'
+          expect(page).to have_content 'runner-b-1'
+          expect(page).not_to have_content 'runner-a-2'
+
+          input_filtered_search_keys('type:project_type runner-a')
+          expect(page).to have_content 'runner-a-1'
+          expect(page).not_to have_content 'runner-b-1'
+          expect(page).not_to have_content 'runner-a-2'
+        end
       end
 
       it 'sorts by last contact date', :js do

spec/finders/admin/runners_finder_spec.rb

@@ -29,6 +29,14 @@ describe Admin::RunnersFinder do
       end
     end
 
+    context 'filter by runner type' do
+      it 'calls the corresponding scope on Ci::Runner' do
+        expect(Ci::Runner).to receive(:project_type).and_call_original
+
+        described_class.new(params: { type_type: 'project_type' }).execute
+      end
+    end
+
     context 'sort' do
       context 'without sort param' do
         it 'sorts by created_at' do